b5bbb540b44cbb901cd8ddf9de64ad3312492053,opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/AbstractDaoRestService.java,AbstractDaoRestService,applyLimitOffsetOrderBy,#MultivaluedMap#CriteriaBuilder#number#,296
Before Change
builder.distinct();
builder.limit(defaultLimit);
if (params.containsKey("limit")) {
builder.limit(Integer.valueOf(params.getFirst("limit")));
params.remove("limit");
}
if (params.containsKey("offset")) {
builder.offset(Integer.valueOf(params.getFirst("offset")));
params.remove("offset");
}
if(params.containsKey("orderBy")) {
builder.orderBy(params.getFirst("orderBy"));
params.remove("orderBy");
if(params.containsKey("order")) {
if("desc".equalsIgnoreCase(params.getFirst("order"))) {
builder.desc();
} else {
builder.asc();
After Change
builder.distinct();
builder.limit(defaultLimit);
if (params.containsKey("limit") && params.getFirst("limit") != null && !"".equals(params.getFirst("limit").trim())) {
builder.limit(Integer.valueOf(params.getFirst("limit").trim()));
params.remove("limit");
}
if (params.containsKey("offset") && params.getFirst("offset") != null && !"".equals(params.getFirst("offset").trim())) {
builder.offset(Integer.valueOf(params.getFirst("offset").trim()));
params.remove("offset");
}
if (params.containsKey("orderBy") && params.getFirst("orderBy") != null && !"".equals(params.getFirst("orderBy").trim())) {
builder.orderBy(params.getFirst("orderBy").trim());
params.remove("orderBy");
if (params.containsKey("order") && params.getFirst("order") != null && !"".equals(params.getFirst("order").trim())) {
if("desc".equalsIgnoreCase(params.getFirst("order").trim())) {
builder.desc();
} else {
builder.asc();